bitkeeper revision 1.1159.1.416 (4195dde6Gb9vkPSCExWfyShB0Sdv0Q)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp

diff --cc linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
index d1edbc9e794e5e08164f5b0ff240c1c7cbd025dc,d6f0b0b5459c69711c0df560a1990019b851c913..a85bf4ba61c316dcaa11dfa520d53de61a5222b5
--- 1/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
--- 2/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
@@@ -42,14 -41,15 +42,14 @@@
   * LOW-LEVEL DEFINITIONS
   */
  
 -/* Force a proper event-channel callback from Xen. */
 -void force_evtchn_callback(void);
 -
  /* Entry point for notifications into Linux subsystems. */
- void evtchn_do_upcall(struct pt_regs *regs);
+ asmlinkage void evtchn_do_upcall(struct pt_regs *regs);
  
  /* Entry point for notifications into the userland character device. */
- asmlinkage void evtchn_device_upcall(int port);
+ void evtchn_device_upcall(int port);
  
 +#ifdef XEN_EVTCHN_MASK_OPS
 +
  static inline void mask_evtchn(int port)
  {
      shared_info_t *s = HYPERVISOR_shared_info;